gtk: rely on default marshallers
authorChristian Hergert <chergert@redhat.com>
Fri, 31 May 2019 03:56:50 +0000 (20:56 -0700)
committerChristian Hergert <chergert@redhat.com>
Fri, 31 May 2019 03:56:50 +0000 (20:56 -0700)
Similar to previous removals of g_cclosure_marshal_VOID__VOID we can remove
other marshallers for which are a simple G_TYPE_NONE with single parameter.
In those cases, GLib will setup both a c_marshaller and va_marshaller for
us. Before this commit, we would not get a va_marshaller because the
c_marshaller is set.

Related to GNOME/Initiatives#10

23 files changed:
gdk/gdkdevice.c
gdk/gdkdisplay.c
gdk/gdkdisplaymanager.c
gdk/gdkdrag.c
gdk/gdkseat.c
gtk/gtkapplication.c
gtk/gtkassistant.c
gtk/gtkcellrendereraccel.c
gtk/gtkcombobox.c
gtk/gtkentry.c
gtk/gtkflowbox.c
gtk/gtkiconview.c
gtk/gtkinfobar.c
gtk/gtklistbox.c
gtk/gtknativedialog.c
gtk/gtkprintbackend.c
gtk/gtkprinter.c
gtk/gtkprintoperation.c
gtk/gtkprintoperationpreview.c
gtk/gtksearchengine.c
gtk/gtktexthandle.c
gtk/gtktoolbar.c
gtk/gtkwidget.c

index 603231ee733bac437fec813d2b820e44d87709e2..7b523ad7303d4d93b783e03819de7a2091354892 100644 (file)
@@ -330,7 +330,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
                   0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1, GDK_TYPE_DEVICE_TOOL);
 }
 
index d8bdff8abb9414536c985fcdecf55c97eb8db833..c2a9e26bf7f4ec6768e909f238073ba72f0aeced 100644 (file)
@@ -237,7 +237,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GdkDisplayClass, closed),
                  NULL, NULL,
-                  g_cclosure_marshal_VOID__BOOLEAN,
+                  NULL,
                  G_TYPE_NONE,
                  1,
                  G_TYPE_BOOLEAN);
@@ -255,7 +255,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST,
                  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                  G_TYPE_NONE, 1, GDK_TYPE_SEAT);
 
   /**
@@ -271,7 +271,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST,
                  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                  G_TYPE_NONE, 1, GDK_TYPE_SEAT);
 
   /**
@@ -287,7 +287,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST,
                  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                  G_TYPE_NONE, 1, GDK_TYPE_MONITOR);
 
   /**
@@ -303,7 +303,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST,
                  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                  G_TYPE_NONE, 1, GDK_TYPE_MONITOR);
 
   /**
index 8025ae406c82d5bbe289cf99837f0860ff797bb0..8a359b77c68ffe60fc393956ba8f27dcd5cd8f9c 100644 (file)
@@ -156,7 +156,7 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDisplayManagerClass, display_opened),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE,
                   1,
                   GDK_TYPE_DISPLAY);
index 5f2f48916883e03f894a07285556ccb6651f673f..acf7a7bede697ce9d1cb1a97ee7584edc39c1333 100644 (file)
@@ -450,7 +450,7 @@ gdk_drag_class_init (GdkDragClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDragClass, cancel),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__ENUM,
+                  NULL,
                   G_TYPE_NONE, 1, GDK_TYPE_DRAG_CANCEL_REASON);
 
   /**
index c13fbed615f88a697c653a0e1e1f3687d225cbd8..3f5f4d762229a7e88eeccea09a1163d7e5398ba2 100644 (file)
@@ -129,7 +129,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkSeatClass, device_added),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE);
 
@@ -147,7 +147,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkSeatClass, device_removed),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE);
 
@@ -168,7 +168,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0, NULL, NULL,
-                  g_cclosure_marshal_VOID__BOXED,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE_TOOL);
 
@@ -185,7 +185,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0, NULL, NULL,
-                  g_cclosure_marshal_VOID__BOXED,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE_TOOL);
 
index 5d8ca76a15065b6406907672560e3301e3f00ad6..25ac9490813aff93d3c0b0caf7c19d4b8e93c93c 100644 (file)
@@ -785,7 +785,7 @@ gtk_application_class_init (GtkApplicationClass *class)
     g_signal_new (I_("window-added"), GTK_TYPE_APPLICATION, G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (GtkApplicationClass, window_added),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1, GTK_TYPE_WINDOW);
 
   /**
@@ -801,7 +801,7 @@ gtk_application_class_init (GtkApplicationClass *class)
     g_signal_new (I_("window-removed"), GTK_TYPE_APPLICATION, G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (GtkApplicationClass, window_removed),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1, GTK_TYPE_WINDOW);
 
   /**
index cb94ee91c8a272650de84bcbe44b32076b28245f..206f78ca4aacb7ff9f84cf0fc7a39899c40ee5ab 100644 (file)
@@ -565,7 +565,7 @@ gtk_assistant_class_init (GtkAssistantClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkAssistantClass, prepare),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1, GTK_TYPE_WIDGET);
 
   /**
index 4f0f1b2bf16e734989a7250befc4ab21c9cafa6d..38dbf83f236a620c206f85c6f1c81abb31591264 100644 (file)
@@ -264,7 +264,7 @@ gtk_cell_renderer_accel_class_init (GtkCellRendererAccelClass *cell_accel_class)
                                          G_SIGNAL_RUN_LAST,
                                          G_STRUCT_OFFSET (GtkCellRendererAccelClass, accel_cleared),
                                          NULL, NULL,
-                                         g_cclosure_marshal_VOID__STRING,
+                                         NULL,
                                          G_TYPE_NONE, 1,
                                          G_TYPE_STRING);
 }
index ca13dc037ac7d5b0c055a6e03df5decbce35b31d..3d8afc863b92187a2ac4c734d34f2e4338a84c40 100644 (file)
@@ -475,7 +475,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
                                 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                                 G_CALLBACK (gtk_combo_box_real_move_active),
                                 NULL, NULL,
-                                g_cclosure_marshal_VOID__ENUM,
+                                NULL,
                                 G_TYPE_NONE, 1,
                                 GTK_TYPE_SCROLL_TYPE);
 
index aa447f573930ad29bd13486e9a1f9f44923e5192..e1cf3131f065a6276e9950699e0e20d01828d686 100644 (file)
@@ -870,7 +870,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                   G_SIGNAL_RUN_LAST,
                   0,
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__ENUM,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_ENTRY_ICON_POSITION);
 
@@ -888,7 +888,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                   G_SIGNAL_RUN_LAST,
                   0,
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__ENUM,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_ENTRY_ICON_POSITION);
 
index e52f505a941dff3b7917ec288aab21ca5474b799..53a417df8227d50468e249ee10b431afddfbb827 100644 (file)
@@ -3531,7 +3531,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
                                            G_SIGNAL_RUN_LAST,
                                            G_STRUCT_OFFSET (GtkFlowBoxClass, child_activated),
                                            NULL, NULL,
-                                           g_cclosure_marshal_VOID__OBJECT,
+                                           NULL,
                                            G_TYPE_NONE, 1,
                                            GTK_TYPE_FLOW_BOX_CHILD);
 
index ef76d1c58504934fb0a66531dbe7e941530c9b58..aa334690282cecd6eb7e70e981a68e727d6064cd 100644 (file)
@@ -649,7 +649,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkIconViewClass, item_activated),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__BOXED,
+                 NULL,
                  G_TYPE_NONE, 1,
                  GTK_TYPE_TREE_PATH);
 
index dcb130e0d54ff559e78bf7c0579791702ef612ee..2e52a5838d5b67c7098ed46dd8e7dae7eece95ce 100644 (file)
@@ -385,7 +385,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass)
                                     G_SIGNAL_RUN_LAST,
                                     G_STRUCT_OFFSET (GtkInfoBarClass, response),
                                     NULL, NULL,
-                                    g_cclosure_marshal_VOID__INT,
+                                    NULL,
                                     G_TYPE_NONE, 1,
                                     G_TYPE_INT);
 
index 02c271c43ace0bd3b05b751824b8b8ad41615c64..ca788a9176a4df27b734212e2cc3f4df0ee15b16 100644 (file)
@@ -507,7 +507,7 @@ gtk_list_box_class_init (GtkListBoxClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkListBoxClass, row_selected),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_LIST_BOX_ROW);
 
@@ -575,7 +575,7 @@ gtk_list_box_class_init (GtkListBoxClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkListBoxClass, row_activated),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_LIST_BOX_ROW);
   signals[ACTIVATE_CURSOR_ROW] =
index ffe783c99f34ad2d034bb8858f0d71f9746f8e31..c97c6c06979feb663302801a70e3d4d3a9da2180 100644 (file)
@@ -270,7 +270,7 @@ gtk_native_dialog_class_init (GtkNativeDialogClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkNativeDialogClass, response),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__INT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   G_TYPE_INT);
 }
index 3c963bb068bd1898b36b18002c58d0f77d1271c2..06be0798e6578a43d006da00a55ecaab93b88b88 100644 (file)
@@ -296,7 +296,7 @@ gtk_print_backend_class_init (GtkPrintBackendClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPrintBackendClass, printer_added),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__OBJECT,
+                 NULL,
                  G_TYPE_NONE, 1, GTK_TYPE_PRINTER);
   signals[PRINTER_REMOVED] =
     g_signal_new (I_("printer-removed"),
@@ -304,7 +304,7 @@ gtk_print_backend_class_init (GtkPrintBackendClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPrintBackendClass, printer_removed),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__OBJECT,
+                 NULL,
                  G_TYPE_NONE, 1, GTK_TYPE_PRINTER);
   signals[PRINTER_STATUS_CHANGED] =
     g_signal_new (I_("printer-status-changed"),
@@ -312,7 +312,7 @@ gtk_print_backend_class_init (GtkPrintBackendClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPrintBackendClass, printer_status_changed),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__OBJECT,
+                 NULL,
                  G_TYPE_NONE, 1, GTK_TYPE_PRINTER);
   signals[REQUEST_PASSWORD] =
     g_signal_new (I_("request-password"),
index 25c189265a8c8ede55917b288b1c1cf7da560439..a871b45466212068ff161af5d1073156b0c1aae3 100644 (file)
@@ -223,7 +223,7 @@ gtk_printer_class_init (GtkPrinterClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPrinterClass, details_acquired),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__BOOLEAN,
+                 NULL,
                  G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 }
 
index 5fb26d386edb2a06d082a4a307efb0e548468b5e..03735d5ba997c4e88826076e552f67b5898c9d67 100644 (file)
@@ -773,7 +773,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPrintOperationClass, done),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__ENUM,
+                 NULL,
                  G_TYPE_NONE, 1, GTK_TYPE_PRINT_OPERATION_RESULT);
 
   /**
@@ -794,7 +794,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPrintOperationClass, begin_print),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__OBJECT,
+                 NULL,
                  G_TYPE_NONE, 1, GTK_TYPE_PRINT_CONTEXT);
 
    /**
@@ -932,7 +932,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPrintOperationClass, end_print),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__OBJECT,
+                 NULL,
                  G_TYPE_NONE, 1, GTK_TYPE_PRINT_CONTEXT);
 
   /**
@@ -1018,7 +1018,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPrintOperationClass, custom_widget_apply),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__OBJECT,
+                 NULL,
                  G_TYPE_NONE, 1, GTK_TYPE_WIDGET);
 
    /**
index cea332fddd1521196da148490300fd3b6db82929..98cca3ffdb4c57024f01bcbc1a70ce5ffb9481ac 100644 (file)
@@ -77,7 +77,7 @@ gtk_print_operation_preview_base_init (gpointer g_iface)
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkPrintOperationPreviewIface, ready),
                    NULL, NULL,
-                   g_cclosure_marshal_VOID__OBJECT,
+                   NULL,
                    G_TYPE_NONE, 1,
                    GTK_TYPE_PRINT_CONTEXT);
 
index 9f1c20e0f48a5555e2e59cbe48690106e08069c5..74496c96950d65c57c752136e1c656b967e92173 100644 (file)
@@ -174,7 +174,7 @@ _gtk_search_engine_class_init (GtkSearchEngineClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkSearchEngineClass, hits_added),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__POINTER,
+                  NULL,
                   G_TYPE_NONE, 1,
                   G_TYPE_POINTER);
 
@@ -193,7 +193,7 @@ _gtk_search_engine_class_init (GtkSearchEngineClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkSearchEngineClass, error),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__STRING,
+                  NULL,
                   G_TYPE_NONE, 1,
                   G_TYPE_STRING);
 }
index 5edbee5de5439fe9f5b55594634e3f86d3384555..25ecd116eae795c7050a6b540e495aaca60bd4ea 100644 (file)
@@ -616,7 +616,7 @@ _gtk_text_handle_class_init (GtkTextHandleClass *klass)
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST, 0,
                  NULL, NULL,
-                  g_cclosure_marshal_VOID__ENUM,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_TEXT_HANDLE_POSITION);
   signals[DRAG_FINISHED] =
@@ -624,7 +624,7 @@ _gtk_text_handle_class_init (GtkTextHandleClass *klass)
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST, 0,
                  NULL, NULL,
-                  g_cclosure_marshal_VOID__ENUM,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_TEXT_HANDLE_POSITION);
 
index 5c2574fde888df7c9a243db014bbc5442a8bb319..93ecd03c04387cbb6079f9b6959f8d48c1f10496 100644 (file)
@@ -410,7 +410,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkToolbarClass, orientation_changed),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__ENUM,
+                 NULL,
                  G_TYPE_NONE, 1,
                  GTK_TYPE_ORIENTATION);
   /**
@@ -426,7 +426,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkToolbarClass, style_changed),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__ENUM,
+                 NULL,
                  G_TYPE_NONE, 1,
                  GTK_TYPE_TOOLBAR_STYLE);
   /**
index 67456abcd564c5e7b49fd1e85f0b8ae8a5d87011..91d74550b55970554b3dcf9d7b010d0e05830b89 100644 (file)
@@ -1666,7 +1666,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_leave),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__OBJECT,
+                 NULL,
                  G_TYPE_NONE, 1,
                  GDK_TYPE_DROP);